Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Ubuntu Jammy CI #577

Merged
merged 5 commits into from
Mar 21, 2022
Merged

Add Ubuntu Jammy CI #577

merged 5 commits into from
Mar 21, 2022

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Mar 5, 2022

🦟 Bug fix

Part of gazebo-tooling/release-tools#566

Summary

Enable CI for Ubuntu 22.04 (Jammy)

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@scpeters
Add Ubuntu Jammy CI
25d0ba6 
Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from iche033 as a code owner March 5, 2022 06:43
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Mar 5, 2022
@scpeters scpeters mentioned this pull request Mar 5, 2022
Closed
@codecov
Copy link

codecov bot commented Mar 5, 2022 •
edited
Loading

Codecov Report

Merging #577 (335a251) into ign-rendering6 (996c58d) will decrease coverage by 0.03%.
The diff coverage is 48.97%.

❗ Current head 335a251 differs from pull request most recent head 5370f67. Consider uploading reports for the commit 5370f67 to get more accurate results

@@                Coverage Diff                 @@
##           ign-rendering6     #577      +/-   ##
==================================================
- Coverage           54.36%   54.33%   -0.04%     
==================================================
  Files                 198      198              
  Lines               20157    20187      +30     
==================================================
+ Hits                10958    10968      +10     
- Misses               9199     9219      +20
Impacted Files Coverage Δ
ogre2/src/Ogre2MaterialSwitcher.cc 80.24% <0.00%> (-4.17%) ⬇️
ogre2/src/Ogre2SegmentationMaterialSwitcher.cc 59.23% <47.05%> (-1.99%) ⬇️
ogre2/src/Ogre2ThermalCamera.cc 88.31% <52.94%> (-1.29%) ⬇️
ogre2/src/Ogre2GpuRays.cc 95.06% <70.00%> (-0.45%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2016cd8...5370f67. Read the comment docs.

@scpeters
Copy link
Member Author

scpeters commented Mar 6, 2022

this needs libogre-2.2-dev for jammy

@chapulina chapulina added tests Broken or missing tests / testing infra needs upstream release Blocked by a release of an upstream library labels Mar 7, 2022
chapulina
chapulina approved these changes Mar 7, 2022
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once CI passes.

@chapulina
Copy link
Contributor

this needs libogre-2.2-dev for jammy

@j-rivero , did we get any version of Ogre 2.X upstreamed to Ubuntu?

@j-rivero
Copy link
Contributor

j-rivero commented Mar 8, 2022 •
edited
Loading

@j-rivero , did we get any version of Ogre 2.X upstreamed to Ubuntu?

It took a while but yes https://packages.ubuntu.com/uk/jammy/libogre-next-dev

Let me add that we still need IgnOGRE2 support for it, since it provides a custom CMake helper that can potentially work almost by its own, more info in gazebosim/gz-cmake#208

@scpeters
Use libogre-next-dev on jammy
c40722b 
Specify different package names for ogre2.2
in distro-specific packages-*.apt files.

Signed-off-by: Steve Peters <[email protected]>
@scpeters
Copy link
Member Author

@j-rivero , did we get any version of Ogre 2.X upstreamed to Ubuntu?

It took a while but yes https://packages.ubuntu.com/uk/jammy/libogre-next-dev

Let me add that we still need IgnOGRE2 support for it, since it provides a custom CMake helper that can potentially work almost by its own, more info in ignitionrobotics/ign-cmake#208

I've moved the ogre2.2 package to distro-specific packages-*.apt files and used libogre-next-dev in packages-jammy.apt in c40722b

@scpeters
Copy link
Member Author

Jammy CI is not failing now, but it's also not finding the ogre-next package:

-- Skipping component [ogre2]: Missing dependency [IgnOGRE2] (Components: HlmsPbs, HlmsUnlit, Overlay).
        ^~~~~ Set SKIP_ogre2=true in cmake to suppress this warning.

@scpeters
Copy link
Member Author

Jammy CI is not failing now, but it's also not finding the ogre-next package:

-- Skipping component [ogre2]: Missing dependency [IgnOGRE2] (Components: HlmsPbs, HlmsUnlit, Overlay).
        ^~~~~ Set SKIP_ogre2=true in cmake to suppress this warning.

I've adapted the patch by @j-rivero from https://github.com/ignition-release/ign-rendering6-release/pull/8/files#diff-93975c3b98779e4d395782d26e01fdfe517a184b37ed202723eb0c57ebcb6cfd in 5370f67

chapulina
chapulina approved these changes Mar 21, 2022
View reviewed changes
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

   -- Checking for module 'OGRE-Next'
  --   Found OGRE-Next, version 2.2.5
  -- /usr/include/OGRE-Next/
  -- /usr/include/OGRE-Next/
  -- Found Ogre  (2.2.5)

@scpeters scpeters merged commit f043b4f into ign-rendering6 Mar 21, 2022
@scpeters scpeters deleted the scpeters/jammy_ci branch March 21, 2022 20:56
@j-rivero j-rivero mentioned this pull request Apr 4, 2022
Merged
8 tasks
j-rivero added a commit that referenced this pull request Apr 8, 2022
@j-rivero
Revert "Add Ubuntu Jammy CI (#577)"
92bbff3 
This reverts commit f043b4f.
@j-rivero j-rivero mentioned this pull request Apr 8, 2022
Merged
8 tasks
@chapulina
Copy link
Contributor

This PR was reverted with a commit directly to ign-rendering6: 92bbff3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chapulina chapulina chapulina approved these changes

@iche033 iche033 Awaiting requested review from iche033 iche033 is a code owner

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress needs upstream release Blocked by a release of an upstream library tests Broken or missing tests / testing infra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scpeters @chapulina @j-rivero